CLR hosting #9572

grendello · 2024-12-02T21:16:21Z

No description provided.

* Add a version script which hides all the symbols except for the handful we have to export. * Enable exceptions

In process to remove object instances for a slightly faster startup

Build is broken atm

jonathanpeppers · 2024-12-03T22:32:06Z

build-tools/create-packs/Microsoft.Android.Runtime.proj

-      <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.debug.so" />
-      <_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.release.so" />
+      <_AndroidRuntimePackAssets Condition=" Exists('$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.debug.so') " Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.debug.so" />
+      <_AndroidRuntimePackAssets Condition=" Exists('$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.release.so') " Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.release.so" />
+      <_AndroidRuntimePackAssets Condition=" Exists('$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libnet-android.debug.so') " Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libnet-android.debug.so" />
+      <_AndroidRuntimePackAssets Condition=" Exists('$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libnet-android.release.so') " Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libnet-android.release.so" />


I'm fixing this up in #9583, but maybe I can split up part of it into a smaller PR.

* Add a version script which hides all the symbols except for the handful we have to export. * Enable exceptions

* main: [native] Use libc++ (#9558) [ci] Fail build if any git tracked files were modified. (#9661) Localized file check-in by OneLocBuild Task (#9663)

The build is broken atm, need to move things around a bit.

* main: Bump to dotnet/sdk@2d6bc4f67d 10.0.100-alpha.1.25060.8 (#9669) [templates] Default `$(SupportedOSPlatformVersion)=24`. (#9656) Bump to dotnet/sdk@a93a592ce9 10.0.100-alpha.1.25056.1 (#9395) LEGO: Pull request (#9667) [tests] use the 'TestName' property (#9664)

* main: Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 10814362 (#9673)

* main: [ci] Add template for setting JAVA_HOME vars (#9671) Bump com.android.tools.build:manifest-merger from 31.7.3 to 31.8.0 (#9678) Bump to dotnet/sdk@2dd591056f 10.0.100-alpha.1.25062.16 (#9679) Bump com.android.tools:r8 from 8.5.35 to 8.7.18 (#9677) Bump to dotnet/java-interop@4f06201 (#9676) Bump to dotnet/android-api-docs@492e524d (#9668) [build] Support JDK-21 (#9672)

At least files end up where they should be :P

* main: [illink] consolidate & remove hardcoded assembly names (#9662) Bump to NuGet/NuGet.Client@aa7eb998 (#9682) [Microsoft.Android.Sdk.Analysis] fix global types (#9680)

jonathanpeppers · 2025-01-15T15:58:08Z

Configuration.props

@@ -216,5 +218,6 @@
  <ItemGroup>
    <AndroidAbiAndRuntimeFlavor Include="@(AndroidSupportedTargetJitAbi)" AndroidRuntime="Mono" />
    <AndroidAbiAndRuntimeFlavor Include="@(AndroidSupportedTargetJitAbi)" AndroidRuntime="NativeAOT" />
+    <AndroidAbiAndRuntimeFlavor Include="@(AndroidSupportedTargetJitAbi)" AndroidRuntime="CoreCLR" />


I couldn't figure out if we should case it CoreClr or CoreCLR:

https://grep.app/search?q=CoreCLR&case=true&filter[repo][0]=dotnet/runtime

https://grep.app/search?q=CoreClr&case=true&filter[repo][0]=dotnet/runtime

I found both, so we can probably decide which we prefer?

I like CoreCLR better, since CLR is an acronym

jonathanpeppers · 2025-01-15T16:01:39Z

...d.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets

+      <_ExcludedNativeLibraries Condition=" '$(AndroidRuntime)' == 'Mono' Or '$(AndroidRuntime)' == '' " Include="libnet-android.debug" />
+      <_ExcludedNativeLibraries Condition=" '$(AndroidRuntime)' == 'Mono' Or '$(AndroidRuntime)' == '' " Include="libnet-android.release" />
+      <_ExcludedNativeLibraries Condition=" '$(AndroidRuntime)' == 'CoreCLR' " Include="libmono-android.debug" />
+      <_ExcludedNativeLibraries Condition=" '$(AndroidRuntime)' == 'CoreCLR' " Include="libmono-android.release" />


So, $(AndroidRuntime) isn't defined for customer's project builds. I think it would always be blank?

Right now, we only have these:

$(UseMonoRuntime)=true

$(_AndroidNativeAot)=true

Maybe we need to figure out what property xamarin/xamarin-macios uses to identify CoreCLR? You can use it for macOS, to choose between Mono & CoreCLR.

Yeah, it would always be blank now and I think we should always expect a value in there. The macios way looks fine.

jonathanpeppers · 2025-01-15T16:06:58Z

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

+  <_AndroidUseCLR Condition=" '$(AndroidRuntime)' == 'CoreCLR' ">True</_AndroidUseCLR>
+  <_AndroidUseCLR Condition=" '$(AndroidRuntime)' != 'CoreCLR' ">False</_AndroidUseCLR>


$(AndroidRuntime) is probably always blank in customer's Android projects, but is this the property to select a runtime? Should the property be in DefaultProperties.targets?

Maybe we should align with xamarin/xamarin-macios?

jonathanpeppers · 2025-01-15T16:42:34Z

Ok, here is what we should do for MSBuild properties for now:

$(_AndroidRuntime) is the property we use throughout Android project builds (customer projects), it can say MonoVM, NativeAOT, or CoreCLR. It is a private property.
If PublishAot=true, $(_AndroidRuntime)=NativeAOT
If UseMonoRuntime=false, $(_AndroidRuntime)=CoreCLR
If $(UseMonoRuntime)="", we default to $(UseMonoRuntime)=true in DefaultProperties.targets
If UseMonoRuntime=true, $(_AndroidRuntime)=MonoVM

We could remove $(_AndroidNativeAot) and check '$(_AndroidRuntime)' == 'NativeAOT' instead. If we keep it, we should introduce $(_AndroidCoreClr).

grendello · 2025-01-15T17:00:39Z

Ok, here is what we should do for MSBuild properties for now:
* `$(_AndroidRuntime)` is the property we use throughout Android project builds (customer projects), it can say `MonoVM`, `NativeAOT`, or `CoreCLR`. It is a private property.

* If `PublishAot=true`, `$(_AndroidRuntime)=NativeAOT`

* If `UseMonoRuntime=false`, `$(_AndroidRuntime)=CoreCLR`

* If `$(UseMonoRuntime)=""`, we default to `$(UseMonoRuntime)=true` in `DefaultProperties.targets`

* If `UseMonoRuntime=true`, `$(_AndroidRuntime)=MonoVM`
We could remove $(_AndroidNativeAot) and check '$(_AndroidRuntime)' == 'NativeAOT' instead. If we keep it, we should introduce $(_AndroidCoreClr).

I like $(_AndroidRuntime) for this, it's much leaner and reads better IMO :)

Context: #9572 (comment) Context: https://github.com/xamarin/xamarin-macios/blob/2009c571aa8a975ab0e0b1785e5484dbd64d6f9b/dotnet/targets/Xamarin.Shared.Sdk.targets#L1004-L1006 To align with xamarin/xamarin-macios, the following public MSBuild properties can be used to select a runtime for iOS, macOS, etc.: * `$(UseMonoRuntime)=true`: MonoVM * `$(UseMonoRuntime)=false`: CoreCLR * `$(PublishAot)=true`: NativeAOT * Defaults if blank, select MonoVM Introduce a private `$(_AndroidRuntime)` property we can use throughout our build to know which runtime is being targetted. This way, if a new property is designed in the future, we can keep using `$(_AndroidRuntime)` and simply update the defaults.

* main: [ci] Run Mac MSBuild tests on `macos-14-arm64` (#9665)

* main: [Mono.Android-Tests] Ignore "BadGateway" test failures. (#9687) [build] Build with Microsoft OpenJDK 21.0.5 (#9683)

…ad of the linux-bionic one

grendello force-pushed the dev/grendel/clr-host branch from cbc08f4 to 0370d7d Compare December 3, 2024 12:41

grendello added 24 commits December 3, 2024 15:11

Enable static linking with libc++

4c6b83d

* Add a version script which hides all the symbols except for the handful we have to export. * Enable exceptions

Remove C++ ABI compatibility sources

e2f89a4

Update apkdesc files

e2ad767

Playing around with some ideas

33500bb

More consistent use of std::string_view + remove unused code

95ecd76

Making EmbeddedAssemblies a static type

539b080

In process to remove object instances for a slightly faster startup

More cleanup

2aa6e2b

More move to static, more cleanup

07246e5

MonodroidRuntime is static now

6649f01

Buglets fixed

51e007a

Trying to find out why AppContext.GetData doesn't appear to work

497e094

Cleanup

00d300f

Lengths and offsets...

69a35ad

Cleanup

01c77c0

Start using std::format and std::string_view string literals

e0b1e57

A bit less of reinterpret_cast<>

15ace79

Conversion to std::format continues

28c6439

Build is broken atm

More std::format

98a4054

Friendlier, no need to use std::format directly in log_* anymore

ac5c3ed

Cleanup

886ef40

Cleanup

15d864f

Update apkdesc files

00f55b5

std::format doesn't like null pointers when printing strings

d383a44

Address feedback

5a4d188

grendello force-pushed the dev/grendel/clr-host branch 2 times, most recently from c085352 to 13bbd93 Compare December 3, 2024 21:15

jonathanpeppers reviewed Dec 3, 2024

View reviewed changes

grendello force-pushed the dev/grendel/clr-host branch from 13bbd93 to 82cfb8a Compare December 4, 2024 18:47

Enable static linking with libc++

18fd987

* Add a version script which hides all the symbols except for the handful we have to export. * Enable exceptions

grendello added 15 commits January 10, 2025 16:54

Merge branch 'main' into dev/grendel/clr-host

0db5414

* main: [native] Use libc++ (#9558) [ci] Fail build if any git tracked files were modified. (#9661) Localized file check-in by OneLocBuild Task (#9663)

Add the CoreCLR runtime falvor

14b675d

The build is broken atm, need to move things around a bit.

Merge branch 'main' into dev/grendel/clr-host

90e4840

* main: Localized file check-in by OneLocBuild Task: Build definition ID 17928: Build ID 10814362 (#9673)

New src/native layout

67bcec9

Reorg continued

c2e17d9

Build appears to be working

b5fa47a

At least files end up where they should be :P

Properly resolve library stubs from runtime packs

0c2654c

Fix java runtime jar inclusion

8fa07fa

Recreate @(ResolvedRuntimePack) item group

b91865d

Merge branch 'main' into dev/grendel/clr-host

160c059

* main: [illink] consolidate & remove hardcoded assembly names (#9662) Bump to NuGet/NuGet.Client@aa7eb998 (#9682) [Microsoft.Android.Sdk.Analysis] fix global types (#9680)

Double-check if a nuget package is indeed our runtime pack

9f71a63

Don't package runtime stubs

8b3977b

Not needed

41d075e

jonathanpeppers reviewed Jan 15, 2025

View reviewed changes

jonathanpeppers mentioned this pull request Jan 15, 2025

[Xamarin.Android.Build.Tasks] introduce $(_AndroidRuntime) property #9686

Open

grendello added 10 commits January 16, 2025 09:23

Merge branch 'main' into dev/grendel/clr-host

0438495

* main: [ci] Run Mac MSBuild tests on `macos-14-arm64` (#9665)

Update to match main

b857673

Remove unnecessary sources

394a016

Import changes from #9686

9ca6c05

Mono -> MonoVM

425301c

Fixes

2d4691f

Fixes and workarounds to make CoreCLR build happen

198acae

Merge branch 'main' into dev/grendel/clr-host

9eef4c4

* main: [Mono.Android-Tests] Ignore "BadGateway" test failures. (#9687) [build] Build with Microsoft OpenJDK 21.0.5 (#9683)

Hack to be able to use CoreCLR runtime pack we created

579505f

Fake CoreCLR runtime pack works. Next step: use correct CoreCLR inste…

66a32f5

…ad of the linux-bionic one

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CLR hosting #9572

CLR hosting #9572

grendello commented Dec 2, 2024 •

edited

Loading

jonathanpeppers Dec 3, 2024

jonathanpeppers Jan 15, 2025

grendello Jan 15, 2025

jonathanpeppers Jan 15, 2025

grendello Jan 15, 2025

jonathanpeppers Jan 15, 2025

jonathanpeppers commented Jan 15, 2025

grendello commented Jan 15, 2025

		<_AndroidUseCLR Condition=" '$(AndroidRuntime)' == 'CoreCLR' ">True</_AndroidUseCLR>
		<_AndroidUseCLR Condition=" '$(AndroidRuntime)' != 'CoreCLR' ">False</_AndroidUseCLR>

CLR hosting #9572

Are you sure you want to change the base?

CLR hosting #9572

Conversation

grendello commented Dec 2, 2024 • edited Loading

jonathanpeppers Dec 3, 2024

Choose a reason for hiding this comment

jonathanpeppers Jan 15, 2025

Choose a reason for hiding this comment

grendello Jan 15, 2025

Choose a reason for hiding this comment

jonathanpeppers Jan 15, 2025

Choose a reason for hiding this comment

grendello Jan 15, 2025

Choose a reason for hiding this comment

jonathanpeppers Jan 15, 2025

Choose a reason for hiding this comment

jonathanpeppers commented Jan 15, 2025

grendello commented Jan 15, 2025

grendello commented Dec 2, 2024 •

edited

Loading